From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 5 Dec 2014 12:46:58 +0000 (+0100)
Subject: union checkout: Fix symlink handling for xattrs
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1035
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=22ed7d0fbf357b640521f8557d28312145b2c84c;p=ostree.git

union checkout: Fix symlink handling for xattrs

Applying xattrs on a symlink during checkout failed since
it was setting the xattrs on the final filename, not the
temporary name.

This made the "checkout union 1" test in test-basic.sh
fail.

https://bugzilla.gnome.org/show_bug.cgi?id=741125
---

diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index 29243d51..531fdf9e 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -271,7 +271,7 @@ checkout_file_unioning_from_input_at (OstreeRepoCheckoutMode mode,
           
       if (xattrs)
         {
-          if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, destination_name,
+          if (!gs_dfd_and_name_set_all_xattrs (destination_dfd, temp_filename,
                                                xattrs, cancellable, error))
             goto out;
         }